From: Keir Fraser <keir.fraser@citrix.com>
Date: Mon, 14 Jul 2008 12:13:39 +0000 (+0100)
Subject: Revert 18025:07c7aef164 -- go back to 8MB VRAM.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14188^2~27
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=63d459b855d9935fdae90663605263c1ecc93aae;p=xen.git

Revert 18025:07c7aef164 -- go back to 8MB VRAM.

We may well want it in future anyway, and changing it makes
save/restore compatibility difficult.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
---

diff --git a/tools/ioemu/vl.h b/tools/ioemu/vl.h
index aa26005a8b..c0e2381030 100644
--- a/tools/ioemu/vl.h
+++ b/tools/ioemu/vl.h
@@ -927,7 +927,7 @@ extern struct soundhw soundhw[];
 
 /* vga.c */
 
-#define VGA_RAM_SIZE (4096 * 1024)
+#define VGA_RAM_SIZE (8192 * 1024)
 
 /* in ms */
 #define GUI_REFRESH_INTERVAL 30
diff --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py
index 0389f05aac..615e56da0f 100644
--- a/tools/python/xen/xend/image.py
+++ b/tools/python/xen/xend/image.py
@@ -833,8 +833,8 @@ class IA64_HVM_ImageHandler(HVMImageHandler):
         # buffer io page, buffer pio page and memmap info page
         extra_pages = 1024 + 5
         mem_kb += extra_pages * page_kb
-        # Add 4 MiB overhead for QEMU's video RAM.
-        return mem_kb + 4096
+        # Add 8 MiB overhead for QEMU's video RAM.
+        return mem_kb + 8192
 
     def getRequiredInitialReservation(self):
         return self.vm.getMemoryTarget()
@@ -876,8 +876,8 @@ class X86_HVM_ImageHandler(HVMImageHandler):
         return rc
 
     def getRequiredAvailableMemory(self, mem_kb):
-        # Add 4 MiB overhead for QEMU's video RAM.
-        return mem_kb + 4096
+        # Add 8 MiB overhead for QEMU's video RAM.
+        return mem_kb + 8192
 
     def getRequiredInitialReservation(self):
         return self.vm.getMemoryTarget()